Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y

diff --cc drivers/i2c/busses/i2c-bcm2835.c
index 8642f580ce41803bd22c76a0fa80d083d0747be1,f283b714aa79e2e4685ed95b04b6b289f7e9eee7..47167f403cc8329bd811b47c7011c299b8ecafee
--- 1/drivers/i2c/busses/i2c-bcm2835.c
--- 2/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@@ -279,7 -128,7 +279,9 @@@ static irqreturn_t bcm2835_i2c_isr(int 
        }
  
        if (val & BCM2835_I2C_S_DONE) {
--              if (i2c_dev->curr_msg->flags & I2C_M_RD) {
++              if (!i2c_dev->curr_msg) {
++                      dev_err(i2c_dev->dev, "Got unexpected interrupt (from firmware?)\n");
++              } else if (i2c_dev->curr_msg->flags & I2C_M_RD) {
                        bcm2835_drain_rxfifo(i2c_dev);
                        val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
                }

diff --cc drivers/usb/core/hub.c
Simple merge